From: Florian Müllner Date: Sun, 28 May 2017 19:46:02 +0000 (+0200) Subject: docs: Use entity for version X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~207 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=26e7962dfe4fe9b5b544da15d48d70ed2397b5b3;p=gnome-shell.git docs: Use entity for version Meson's gtk-doc support currently requires the main SGML/XML file to be located in the srcdir, so instead of substituting the module version in that file directly, use a small auxiliary file that's included via a custom entity. https://bugzilla.gnome.org/show_bug.cgi?id=783229 --- diff --git a/configure.ac b/configure.ac index 916d7c108..db30125df 100644 --- a/configure.ac +++ b/configure.ac @@ -254,9 +254,9 @@ AC_CONFIG_FILES([ docs/Makefile docs/reference/Makefile docs/reference/shell/Makefile - docs/reference/shell/shell-docs.sgml + docs/reference/shell/version.xml docs/reference/st/Makefile - docs/reference/st/st-docs.sgml + docs/reference/st/version.xml js/Makefile src/Makefile subprojects/gvc/Makefile diff --git a/docs/reference/shell/Makefile.am b/docs/reference/shell/Makefile.am index ad3a3defe..715e3f26c 100644 --- a/docs/reference/shell/Makefile.am +++ b/docs/reference/shell/Makefile.am @@ -120,7 +120,7 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += +EXTRA_DIST += version.xml.in # Files not to distribute # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types diff --git a/docs/reference/shell/shell-docs.sgml b/docs/reference/shell/shell-docs.sgml new file mode 100644 index 000000000..c349f84a5 --- /dev/null +++ b/docs/reference/shell/shell-docs.sgml @@ -0,0 +1,69 @@ + + + +]> + + + Shell Reference Manual + + for Shell &version;. + + + + + + Actors + + + + + Application tracking + + + + + + Search + + + + Tray Icons + + + + + + + Recorder + + + + Integration helpers and utilities + + + + + + + + + + + Object Hierarchy + + + + API Index + + + + Index of deprecated API + + + + + diff --git a/docs/reference/shell/shell-docs.sgml.in b/docs/reference/shell/shell-docs.sgml.in deleted file mode 100644 index 14a9cf1cd..000000000 --- a/docs/reference/shell/shell-docs.sgml.in +++ /dev/null @@ -1,68 +0,0 @@ - - -]> - - - Shell Reference Manual - - for Shell @VERSION@. - - - - - - Actors - - - - - Application tracking - - - - - - Search - - - - Tray Icons - - - - - - - Recorder - - - - Integration helpers and utilities - - - - - - - - - - - Object Hierarchy - - - - API Index - - - - Index of deprecated API - - - - - diff --git a/docs/reference/shell/version.xml.in b/docs/reference/shell/version.xml.in new file mode 100644 index 000000000..d78bda934 --- /dev/null +++ b/docs/reference/shell/version.xml.in @@ -0,0 +1 @@ +@VERSION@ diff --git a/docs/reference/st/Makefile.am b/docs/reference/st/Makefile.am index 18e837d24..df2d357d5 100644 --- a/docs/reference/st/Makefile.am +++ b/docs/reference/st/Makefile.am @@ -85,7 +85,7 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += +EXTRA_DIST += version.xml.in # Files not to distribute # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types diff --git a/docs/reference/st/st-docs.sgml b/docs/reference/st/st-docs.sgml new file mode 100644 index 000000000..788c20460 --- /dev/null +++ b/docs/reference/st/st-docs.sgml @@ -0,0 +1,64 @@ + + + +]> + + + St Reference Manual + + for St &version;. + + + + + + API reference + + Abstract classes and Interfaces + + + + + + Widgets + + + + + + + + Containers + + + + + + + Styling + + + + + + + + + Object Hierarchy + + + + API Index + + + + Index of deprecated API + + + + + diff --git a/docs/reference/st/st-docs.sgml.in b/docs/reference/st/st-docs.sgml.in deleted file mode 100644 index f5df261d7..000000000 --- a/docs/reference/st/st-docs.sgml.in +++ /dev/null @@ -1,63 +0,0 @@ - - -]> - - - St Reference Manual - - for St @VERSION@. - - - - - - API reference - - Abstract classes and Interfaces - - - - - - Widgets - - - - - - - - Containers - - - - - - - Styling - - - - - - - - - Object Hierarchy - - - - API Index - - - - Index of deprecated API - - - - - diff --git a/docs/reference/st/version.xml.in b/docs/reference/st/version.xml.in new file mode 100644 index 000000000..d78bda934 --- /dev/null +++ b/docs/reference/st/version.xml.in @@ -0,0 +1 @@ +@VERSION@